ppc4xx: Update Acadia to not setup PLL when booting via bootstrap EEPROM

Signed-off-by: Stefan Roese <[email protected]>

diff --git a/board/amcc/acadia/acadia.c b/board/amcc/acadia/acadia.c
index 7d0046a22f99e3d56986b81dab0f58179abae11c..baf598c677300d8ad3f771412a38b91777914175 100644 (file)
--- a/board/amcc/acadia/acadia.c
+++ b/board/amcc/acadia/acadia.c
@@ -26,7 +26,7 @@
 
 extern void board_pll_init_f(void);
 
-void liveoak_gpio_init(void)
+static void acadia_gpio_init(void)
 {
        /*
         * GPIO0 setup (select GPIO or alternate function)
@@ -55,8 +55,12 @@ int board_early_init_f(void)
 {
        unsigned int reg;
 
-       board_pll_init_f();
-       liveoak_gpio_init();
+       /* don't reinit PLL when booting via I2C bootstrap option */
+       mfsdr(SDR_PINSTP, reg);
+       if (reg != 0xf0000000)
+               board_pll_init_f();
+
+       acadia_gpio_init();
 
        /* USB Host core needs this bit set */
        mfsdr(sdrultra1, reg);